clean up commented out old code
7 files changed