Cleanup
WG Klassen Ref's

+WG31
+WG32