Revert "Clear up verion of mapUsers. Full coments"

This reverts commit e5599ce7532748cf629ff7f7fc1b3ea53eace822.