A bunch of cleanup

Happy to chat about details