Remove excessive let bindings