#16 File cleanup