Stabilize settings before release

[ijpulidos]

We need to stabilize settings, especially make sure that we don't remove settings (adding new settings shouldn't be much of a problem). This issue is created as a need to double check that we indeed have all the settings that we need and they live in the correct parts of the code (or settings objects).