Clean up remaining relics from QML conversion
Merge pull request #27 from pez4brian/master

Clean up remaining relics from QML conversion