Remove typing annotation that were never checked

[pehala]

• Mypy no longer throws warning/note
• Included unneeded reorg of imports, not sure if it matter here