Remove Wapiti dependency