refactoring - general

remove dead code