Removed pre-optimization