Zapped unnecessary np and mp arguments