Merge Auth and cleanup dbref expansion