Renamed a method and removed unused references