Remove unused uriparams variable + done TODO