Cleanup.py fixed