Pass a cleanup through all this nonsense to start off with.