Removes all signs of the second system state

The code compiles but still needs testing.