Clean up files (Issue #347)