Yes, we can remove them all in one PR. Issue?