More cleaup on mongodb upload.py.