Latest round of cleanup

May the 4th be with you! Make sure to read the commit messages!