Cleaning up and removing broken features