Tidy up for freepbx_engine