Enable client-side only fields in Models

Also did some clean up in core