Merge "Remove unnecessary context usage"