Revert "Main NPC UPDT"

This reverts commit b287767e1ac58181e845ee4ab05ac67209fe0eff.