Removing crufty un-needed old code
Prepping for final.
Final updates