Remove settings
Merge branches 'master' and 'mobile_fix'