fix subscription URL and remove duplicate declarations.
Merge pull request #1 from mgarlanger/master

fix subscription URL and remove duplicate declarations.