Remove needs for FIS and FOS