removing debug code and comments
Finalizing this phase of development.  Other features to come once this code is accepted into the codebase.