Let's fix the inability to remove states and we are golden