So far we've been using the blockID instead of a flag to determine whether a block is a broadcast, an RDD, or something else. Please do it that way here instead of adding a new boolean flag just for broadcasts. In the cleanup part you can just check if the block ID starts with "broadcast_".