remove these changes because they impact pickers elsewhere
Update format and fix error on final step