Cleanup the BDD visitor pattern