cleanup command and executor package