removed commented-out stuff