Clean up of delay.cc