removed commented-out crap