Can you remove this removal? Don't want to couple removing this file with this PR.