Removed some commented junk