got rid of teardown step to stop issues w no id