Removed static function