Also do some cleanup (unused arguments, unnecessary casts, etc.) Change-Id: If1f8cc173ca6fee33c54f4437bc5dcdbc75e5947