Removed some unmigrated fields from source files