cleaning stuff up here so things can be better in the Worker module.