Further reduce memory consumption