Activate new code and remove unneeded AutoPtr re #8546

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>