Code cleanuo to remove ununsed methods classes and renaming few classes