removed unused method
Renamed method