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

removed unused argument (also see below)