Cleanups

Not sure if you want all of these, feel free to cherry-pick if not.