collect.py: cleanup code