Cleanup vendor and add quincyatt support