Removing obsolete arguments