Remove unused methods and refactor