Clean up let-binding infrastructure

1 job for master in 22 minutes and 21 seconds (queued for 5 seconds)