sender.py cleanup