Merge "Clean up two unused parameters."