Remove unnecessary memory allocations

 Bug: 5581637
 Also delete some dead, unused code

Change-Id: If6efd11f5032141dadbfcd0b3215e89b464e5f35
5 files changed