Clean up arena code