Remove BBOX expansion performance optimization