Removed more 1-D stuff from lib and tests.