[sd2_mr0671] Remove own version of npc_tipsy_mcmanus. Use sd2 once to simplify finding missing content by diff