a lot of cleanup

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