Another cleanup in version / init