Arena code needs lots of cleanup