Have conversed with Shane and while both ways will work it's better to leave it in.

Means a bit of extra hacking on my end though, so watch this space!!