Cleanup: cleanup in script, removed old comments