clean up, match to cm12