Revert "Much updates."

This reverts commit ca293a7bd77f7645ecddd5b3a94fa0de5eb30f55.