extract cleanup