Removed the auto-optimization