Comment out octree/ not this time :-(