QtCreator support and more cleanup.