bugfix. Finished remove_block