Remove old Metrics code and deprecated message method