CARE#44: Removed unused files and messages