Fix for #117, and removed unused class.

Basically what the title says