Merge "Remove unused kf rate variables"