Added remove_block code