final clean-up..hopefully