no more upserters file, other minor code refactoring