Issue #2393391 by nod_: JS clean-up for re-worked Field UI