cleanup in preparation for advancing "persistent" branch to v2.0 branch as new repository default