Better file cleanup