Removing QCA dependency