remove colock status, history clocks, and add repeat types