Cleanup versioning in etc