This code should have never been there to begin with.
Closes #25