Removes all signs of the second system state

The code compiles but still needs testing.
Merge pull request #1 from dhoule/RemoveSystem2

Removes all signs of the second system state