Cleaned up the code so that Avior will only use the ip provided.