removed unused imports, added tear down