Various changes to remove soundcloud capabilities