Cleaning up in preparation for migrating to PAC