remove uses of arg in the codebase