removed unused tables, code.. fixed stats for null entries