Updates to notebooks - further cleanup.