Even more state removal