a bunch of tidying and obsolete code removal
a bunch of tidying and obsolete code removal

mmuggli/doppelganger,mmuggli/doppelganger,mmuggli/KOHDISTA,mmuggli/doppelganger,mmuggli/doppelganger,mmuggli/KOHDISTA,mmuggli/KOHDISTA,mmuggli/KOHDISTA