Removed old optimizations