merged and deleted deprecated files
merged and deleted deprecated files