Refactor (and remove all cterm stuff)
Merge