Clean up.
Merge branch 'develop' of https://github.com/runeandersen92/SkemaSystem into develop