Removed some commented out code, leftover from previous simplification.