Revert "numerous changes and fixes to users, cms and logs app along with common"

This reverts commit ef61407a29e67177ba0068ed4b03cbb2b4c7b0e0.