Cleanups

Making some cleanups. Lots of garbage for trying out things.