More resolver cleanup - still haven't changed Soundcloud or Officialfm because I don't like their official ones.