Delete ec.py.* and consolidate