Removed more redundant code (note: a lot of CNpc initialization code is still redundant, need to be careful of the different logic involved there).