Removed unused methods and did few renamings