Removed more cruft.
Fixed memory test builds.