remove some more local declarations of null frames