Code Cleanup: Removed commented out code.