Removed some commented-out code, etc