Revert "moved code to active users"

This reverts commit 2d847454484145ee3e121e01c72412ac5f7fd4ee.