Remove use of auto param