It should be amended, yes, to disallow it's role in Marriage. Void the term, which has a deep historical context to religion, and have the state merely recognize legal unions of individuals. This allows for filing jointly and such, but would also protect the privacy of all individuals and their relationships.