A lot internal cleanup
Removed an unnecessary fallback import