Also removed some unused parameters I found on the way. Bug: 25191623 Change-Id: Ib9a30db106467c114cc8b54a5b13ed3e88162d56