Better remove fields in JS
Merge branch 'entry_steps'