Mainly to help cleaning up the Search 6 POC: if we're starting with a clean slate, we should make sure it's as clean as possible.