Cleanup again. I can play with imports from __init__