Remove device_ids and user_id from the entity API