Remove support for FES