Implement a more clear state stub