Revert "Add Official Extend"

This reverts commit 666c155e95e9c6c40bd37f1cc96f6d7238caafd0.