Some optimizatiosn + remove not needed message
Add support to disable and enable arenas