Removed as much of ContentVersionImpl-dependencies as possible.