Clean-up in shrubbot.* files prior to changes.