Move some settings into local settings