:scissors: I would actually leave cleanup like that for later, and have this PR concentrate on removing active-support and changing the plugin call back approach, otherwise we'll get into scope creep on this PR...