Don't use empty_label for multiple select. Clean up commented code.
Clean up unnecessary code