additional flxdelay cleanup