Remove some redundant lets