commented code cleanup