Revert "Data Definition"

This reverts commit d63fff798ed432ed45baa1082a094b348cc72470.