ss.py cleanup