Closes #60 - all unneeded DS removed