Finish rmdir and add remove_block