Remove code duplication
Move deletion of raids into separate action