Tools: remove old wrappers