clearing out old code
Merge branch 'setadmin' into testing