Fixed the filename removal