Doing file cleanup better