Removed performance bottlenecks