QML cleanup
QML cleanup
Switched to internal static library