Clean up files a bit
Clean up files a bit