Merge "Remove extranious fmas product properties"