[OE-3963] removed boilerplate