Cleanup of reduced structure,making unit tests work again.