removed protocols

added wildcards, removed redundancies