updated code to conform to changes in RinSim, removed depracted package