mc brute tidy
Further tidies
Land #3422, SAP Bruterforcer datastore cleanup