HR-352 Remove default contact sub-types changes