last of the cleanups

I think this is the last of the cleanup. only remaining ones are using .peer