Clean ups and beat downs

This is a simplification of the front end for thoth. There is more cleanup that can be done, but I think this moves in the right direction.