File name modification and removed unused