cleanup from delay bug WIP