Merge "removed some unused imports"