Modified completion "menu" fields.
Remove unused parameters