LILY-361: remove unneeded extra context
LILY-361: style improv
temp commit