Remove possibly buggy changeSource use