Revert "Empty classes for return. Schema defined."

This reverts commit 1efad1ff246a9806edd76e49025079a137a3c0dd.