cleanup of some logic and UI.  Unrelated to branch
missed a step in cleanup last commit