Clean up subsystem versions

Do not merge until #4177 has been merged, or replaced by this PR