remove settings
Merge branch 'feature-disable-settings-from-menu' into develop