Remove let optimization