Got rid of common fields