cleanup: removed unused variables and imports