A few more param leftovers removed