Add missing files
Remove unneeded references