Remove unused files
Upgrade