Removed some competed out code and bad comment that started with ##