Cleaning up unused files lingering behind after 2.1 merge.