clean up, the hard way :>