merged and deleted deprecated files