Removed Djangochoices, cleaning up code using labels