Remove references to Payments