Cleaning up CP error