Feature/settings cleanup