Removed and fixed some NPCs and removed some old functions.