Revert "billing and shipping address (kickoff)"

This reverts commit 657c892f0e94de3af3860d8e3353477ea19c41f9.