Remove static function unused since 971f1fa9