cleanup a bit of mess