deleted various commented-out old code