cleaning up some interactions with RTR and workers