Revert "Project differences"

This reverts commit 9c5de9f0133cedf7ec60b38a016393cce4a8c7d2.
Revert "A bit more work on payment service"

This reverts commit 4363f6535c5e8d5e1118e8c4b8f0cdf5244e5cd3.
Undo all payment service stuff