Removed a bunch of places where host was unneeded