Merge "Cleaned up dead code" am: d5a744abb6
am: c5aa9448a7

Change-Id: Ibab85fe8fcfab852d1f761749135e61dd7dfe7e7