Cleanup, oh so much cleanup