Remove unnecessary scope