Clean up Arena constructors