Removed dead code and unused arguments (+ fixed a few typos)

only two arguments are needed (see above)