Some updates

Mostly stripping out what I don't need.