Remove use of static function