Add missing file; remove unneeded file