More capper removal work.

Test version should work, just won't apply damage.