updated remove.wait