Code Cleanup

removing unnecessary code