final round of code cleanup, removing old junk code lines, etc.