Remove un-needed arguments