remove waitcleanup (merge with waitkill)