Defense cleanup (11/48)

Defense cleanup