Revert "Cleanup the horrible code"

This reverts commit aa06496346a875f7c155e5d381a772c14325c1eb.
Add healthyness checking into Orc