removed and consolidated old files