DEV-28 - Delay - cleanup