fix subscription URL and remove duplicate declarations.