scope buffer: clean imports
Merge pull request #2695 from 9il/sb

scope buffer: clean imports