Revert "Add more domain logic"

This reverts commit f47da46efcd5cc42be1573838ebdfe850ce1ecc5.