Removed a couple of new unused HumanNPC functions from merge, now that I've verified they're not used.