Clean
Model objects POCO
Revert "Clean"

This reverts commit ecf2e888d384481ad817bc4ea24c5386068ee072.