cleanup of movers and master.py