Removing dead code. Fixed #10