Refactoring; Removed unused methods and variables