Remove host checking