Fix. Remove 1-D stuff left behind.
Merge branch 'baagaard/remove-1d'

* baagaard/remove-1d:
  Fix. Remove 1-D stuff left behind.