Get rid of text label fields for now