cleanup of __init__.py imports