Removed more commented code again.