Small fixes.
Removed commented out code.