[#84104340] Moved user dataSource to separate class. Removed DVSDemoUser.