Cleaning up the catalogue