Changes for settings / users split and cleanup