Remove FFS and other updates