remove redundant username/password/team options from commands