removed some unused imports
merge