Cleaned up unused code

-Removed some commented out or otherwise unreachable code.