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

Change-Id: Ib166230d692cc7a3973355239161ed88ffd6af60