Code Cleanup

Removed unnecessary commented code