cleanup of unused variables and imports