Refactoring: removed unused code/classes