Removed dead code
Removed dead code
Refactoring for #71