removed SAFEST specific stuff