Clean up some un-used arguments