removed big chunk of commented-out code