Cleanup | Removing commented out code | <Ajay>