Govt to divorce certain pieces of marriage policy