Removed some dead arguments