Revert "Client and admin side uptades"

This reverts commit 1dd810fa229774b2595ca6a3d03da4379f0492bd.