Cleanup - added header comment block, removed dead code.
Revised
Removed debug code, but kept one line as a comment as it could be useful later...