remove custom keystone dependency