removing next id code (will come back in some other form)
little more import cleanup