(Settings data) Get rid of breaking optimizations - if we want to reintroduce
this, should be reimplemented