am afbee625: Remove nonexistant classes and update existing ones

# Via Vikram Aggarwal
* commit 'afbee625adbb5d1473b37c55e0e3cdf418d29957':
  Remove nonexistant classes and update existing ones