Removing confirmation and payment steps