Remove hardcoded params -- again...