Defense cleanup (10/48)

Defense cleanup