Removed delay.{h,c} since no longer required