Removed commented out code.
Const cleanup.