v0.6 - Remove some weird imports