remove dead code and respective tests