Remove some unused internal parameters