Removed more kruft.