Removing legacy monkey business.