Commented code cleanup