Final Cleanup of octree code