Code Cleanup

Removing unused code.