Remove hardcoded data for form field stores