remove block_given? inside blocks