Refactorings and deletions of unused/old files.