another round of refactoring
removed unused methods