More cleanup of unused files and tracking of new files