Tidy delays

Removes delay proxies, and avoids delaying things it doesn’t have to.