removed the IP specific stuff