Commented out code cleanup.