#719 Fixing build failure, remove unused class