Removing unneeded methods. Refactoring.