move cleanup down