WIP. Code cleanup.  Deleted code that is no longer used/needed.