Remove unused functions
Fix issue static call to non static function