Cleanup unneeded settings
Unneeded settings cleanup re #70