Move deletion of raids into separate action