basic cleanup for next version