Some file trace clean up