got rid of the type families, but I had to add more explicit type signatures
removed some nonsense files