Revert "fix all possible errors"

This reverts commit f62d272f4c991e30a68a91b0f6a790fb67ebb126.