Cleaning up the cfp