Remove some bottlenecks