More X removal for QNX