clean up some of the last devs to make it work standalone
clean up addresses filling checkout step