Merge pull request #244 from joakim-hove/master

More state_map updates
Removed stale demo code