Changes to deal with shutting down of HOTTans