Removed more commented code.