Chnages to pfile clean