Removed more commented-out code