More refactoring to get rid of unneeded methods