Remove status fields from the factories