Removed some competed out code and comment with starting with ## because some PO editors don't like thus.