Remove unused class files
Remove unused imports
Load changes from the disk store