move small classes. remove dead code.