CARE #81: Remove unused classes and methods; added a couple of fixes