Revert "Fix interface for model definition."

This reverts commit d8d8497f080b41cf94de02c4768404ad1d9c1d03.
Revert "Add interface for model definition."

This reverts commit 11f07cdc15156e6f88f2a018ce288fbe6b8fe751.