Remove unused user+database params from grant define