Remove broker niceness for now, on the future the options will be together with the schedule