Remove use of named parameters