Remove dead code ; refactoring ; class name changes