remove admin
remove admin
some cleanup