Revert "fixes, adding active set in db"

This reverts commit a7f5648fb9952177582de15286ab0c5d0f146e37.