removed unused imports and fixed minor errors