Hide the settings menu behind a flag whist in dev
Remove dead code