code cleanup (remove extra comments)