Remove not used fields for now