add cleanup step and make some steps non-interactive