more run.py cleanup