[ORB-121] cleanup