Add new+missing things, remove removed things

Change-Id: I37fd6a1078a9e2857cd41a6bcdc7a817615dcbeb