Cleanup where some steps happen