Revert "Taking all arena stuff"

This reverts commit 97f54b56a12d972a96c91e6049177ebc89eee24e.