Could you remove this function instead?