Some simple cleanups
Merge branch 'master' of git://github.com/MINISTRYGmbH/morrow-core