remove override of sub context as it caused issues when no layout was specified