um: clean up delay functions