Removed unnessesary shit in CEM