Code clean up.
Removed a few no longer relevant commented sections