remove unnecessary scope
Remove Modernize dependency