First new version cleanup, more to come