Oh, also kill the unit tests for flattening.