Cleanup attack bug