Deleted CP section and added some settings