diff --git a/data/cchesed/functions/bft/block/remove.mcfunction b/data/cchesed/functions/bft/block/remove.mcfunction
index 64f4a8c..04d9d13 100644
--- a/data/cchesed/functions/bft/block/remove.mcfunction
+++ b/data/cchesed/functions/bft/block/remove.mcfunction
@@ -1,2 +1,2 @@
-execute as @e[tag=cc.ft.llama] at @s unless block ~ ~ ~ minecraft:fletching_table run tp @s ~ ~-500 ~
-execute as @e[tag=cc.ft.table_display] at @s unless block ~ ~ ~ minecraft:fletching_table run kill @s
+tp @s ~ ~-500 ~
+kill @s
diff --git a/data/cchesed/functions/bft/tick/tick_llama.mcfunction b/data/cchesed/functions/bft/tick/tick_llama.mcfunction
index 7cc7b8f..a618b58 100644
--- a/data/cchesed/functions/bft/tick/tick_llama.mcfunction
+++ b/data/cchesed/functions/bft/tick/tick_llama.mcfunction
@@ -29,4 +29,5 @@ function cchesed:bft/recipe/_check_all_recipes
 # ------------------------------ block handling ------------------------------ #
 
 # If block is broken or moved
-execute unless block ~ ~ ~ minecraft:fletching_table run function cchesed:bft/block/remove
\ No newline at end of file
+# We run it per llama, this reduces computation calls
+execute unless block ~ ~ ~ minecraft:fletching_table as @e[tag=cc.ft.table] at @s unless block ~ ~ ~ minecraft:fletching_table run function cchesed:bft/block/remove
\ No newline at end of file