Removed simplifiations of trivial components.