Added settings
Removed db