finished removing payment namespace