Nitpick formatting
Removes double choices reversal

This already takes place in the form's cleaning methods, so this code was trying to validate a dbvalue as if it was a pretty choices name.

That said, we should still eventually be using a drop-down instead of a text field for choices-based fields.
Remove deprecated code block