Remove fields that are not needed with view-based allocation. Change-Id: I23dc75fea47c532ad46e23b7fb14ff8e46c68db1