Merge "Cleaned up dead code"
am: d14ed44c52

Change-Id: I2b28c73090b0a1a9a15e4a104acdbca7e43abecf