Code Cleanup

Removed unnecessary code.