Removed unused code. Closes #69