Cleanup regarding QML imports