removed commented junk