finish removing data lookups from kickstack