delete unused classes

Change-Id: I49ebe40e255f34ab037fe8f8d0147493d2e578b5