Removing silly broadcast nonsense