Revert "More optimization and ota update"

This reverts commit 33f2722b06c3528f7832b19c912eb139e3a8d144.