Removing dead code
Removi
Closes #4