removed unnecessary variables and imports