WIP
Remove some unused params in re3