Remove S_DELAY macros