Merge "Revert "Delete unused classes""