Update based on comments from PR

Remove code that was part of expirement
General doc updates