Added file cleanup