Clean up, isUser property no longer needed in data\Settings