Tidy delays

Removes delay proxies, and limits the number of delays made.