Remove no longer needed settings
Remove more unneeded settings (for now)