Remove unused variables

Closes #13