remove static function and other stuff