Also some unused data structures/references removed. Change-Id: I295809e887173543e794250cb60ddaf1475ffd24