Remove unneded relationships and add Payment Method and Gateway
Docs