Fixes some issues with removing of settings class.