Remove tabs and whitespace
Remove "settings" term.
Remove whitespace.
Remove "settings" term.
Merge pull request #2335 from jburel/rebased/develop/remove-settings

Remove settings (rebased onto develop)