Simplify delay code some more