Revert "cleaned-up code"

This reverts commit f7690ac5341b846c45105c445f86de48a32cb6a1.
Revert "resharper clean-up schema"

This reverts commit 8f347e27b34e7ffc5fa663f34b85c147f54e225d.