[UPD] Remove deprecated fields