Remove host-specific stuff