Add missing files
Remove unused