Clean up settings management & test it