Revert "Adding administration capabilities"

This reverts commit 85473998b7bb9e7215b4411bec31a60bb38e0ada.
Merge branch 'develop'