Remove some dead code.
Get rid of unused variable.
Add some args tests.