Progress since return to this project;  cleanups and simplifications mostly.
Deleted old header file