code cleanup, removing unnecessary broadcast