Sry about this one, it's a test commit without purpose
Revert "Sry about this one, it's a test commit without purpose"

This reverts commit 5cdc1a7b0291ac38b273c624809d17b62837205d.
Revert "Jaros fixes to the StateMap"

This reverts commit f75250b4c97374789cc46a9a143aa280589d5a7c.