Don't load deleted files
Fixing errors
More fixes
More fixes
Remove old stuff