#719 Fixing build failure, remove unused class
Merge pull request #729 from pshivana/master

#719 Fixing build failure, removed unused class