v0.30 - cleanup

Removed unused code.  Various comment and formatting changes