Omnify and remove CM related stuff