Revert "clean up admin assign"

This reverts commit 506c460cf6112734f14d9e685d0c5dca6b781111.