Perform last (hopefully) major clean-up