Remove remaining mdelay() macros