small refactor, removing unused methods and variables