Cleaning up root __init__.py