evacuation client code cleaned up in line with model changes.