Fixed #58.
Removed dead code.