move common calls to helpers.py, remove unused import