Cleaning up the modes