Removing internal versioning 2/2