Remove notion of Chunk and make an overral simplification