Clean up
Settings now support policy to specify local or roaming