I've cleared out the dead code as you suggested—at least, I think so. To be honest, I haven't done a 100% thorough check yet.
Thanks, I’ll try to have a look later this week!