Cleanup in Chunck* classes

Change-Id: I7275b46e42cd8fa2551c565dded68c1b1a0b230a