Removing prepareIp abstraction