Removed more 1-D stuff from lib and tests.
Merge branch 'baagaard/remove-1d'

* baagaard/remove-1d:
  Removed more 1-D stuff from lib and tests.