Removed a couple more “universal”s