Revert "thread safer data storage in selector"

This reverts commit ec7081e40e82e09b5c5ff02f3a7be7175a094fe1.
as it's not actually necessary or useful