Revert "Revert "Unused classes deleted.""

This reverts commit a5604b893a0a7f1061d50a3f0cd675ef6620c844.