Merge "Delete pointer sized fields"