Remove ugly hack
Restructured settings