Trying to factor BVA out into its own class
Don't include simplifier into clause cleaner
Moving BVA into bva.cpp