Merge "Clean up: delete unused methods" am: 41f9566da8
am: b371dea0cb

Change-Id: I0545f7f9914337d64d8d91eb152005e4858b6869