Deconflict, remove auto generated stuff