Remove redundant code

Apologies, Rob. I neglected to delete some now redundant code as part of my previous PR. This PR tidies things up.