remove almost all deprecated methods and classes
simplify code