Cleaning up more host stuff