remove scoping, it's just confusing and fixes tests in main app