Clean up the rest of the class hierarchy, prepare for npc table