Remove more deprecated files