JBTM-1478 tidy up in prep