Clean Up Your State! (Extended)