Remove unused done callbacks
Remove dependency on should
Add re-require injection for sandboxing
increment version of functor