fix: match api signatures to keep it consistent and removed unused code

fix: match api signatures to keep it consistent and removed unused code #1605