Refactoring to remove serialization on properties with a simple data type