Remove public function