Clearing old state when reloading. Furthers along #21.