form-select cleanup