[DIY-87] removed context