If we resolve on removing this we should remove it from here too.