Removing internal versioning 1/2