Remove duplication

Closes #76