Cleaning up for CR again