removed unused entities. no more json.entities as all of them should use inner types (except Status)