Code Cleanup - Removal of unused methods and objects