Cleanup of Bayes net.  Ready to refactor