Simplify cleanup_delay slightly