Simplify region/state to only region

This fixes #19 and makes #79 obsolete.