cleanup - removed old NEW: comments :)