vendor : fos cleanup