The great deflation - slowly merging all aspects into normal classes