Fos Vendor cleanup -- Thanks to Slimroms for the vendor base