Commented-out code removed