Removed some unneeded commented-out code