Put back file removal. Refs #6812