defib rework
Merge pull request #1534 from wild-billy/defibs

Defib clean-up