fixed a bug, removed unused imports