Remove commented-out imports that are misleading