a lot of cleanup

dn42 wiki committed 2014-07-09 18:48:52 +0200 commit d83c2b864f632dfcd0b0f45dcffb14faed69fdb3