Merge "Remove no longer needed broadcasts" into sc-dev