cleaned up more payment stuff