Revert "Implementation of Koush superuser (2/3)"

This reverts commit 36ae21192a5b14d3102b029e5e4ad3f18547d77a.