minor changes, removed unused imports