[RM] removing remainings