fix stop cleanup