cleanup some stuff

Need to figure out generating pairwise independent hash functions