cleaned up unused variables and imports