#719 Fixing build failure, removed unused class