cleanup step-by-step added