Revert "Fix Errors one by one" And fix it properly

This reverts commit a0bc0d90b16c0b593e05c4d8717743986e1f7d99.