also cleaned up tree and removed deprecated eventmanager methods