new files + cleanup