Remove references to params