#83 Removed unused class