Move calculated_fields out of BaseEntity.

Move calculated_fields keys out of BaseEntity and into Entity so they arent used in posting data.