Remove UFPS due to issues