More removal of arguments