Removed confusing commented-out garbage