Code Cleanup

Removed commented code out.