@jameshalsall Can this function be removed?