adding missing cleanseNullValues calls, removing alerts