Removing not used variable and setting the correct name space
for a static function