Removed more commented code that was missed