Improve statue removal