Removed WAYF requirement (move to ding_wayf)