some cleanup.
removed commented lines.