New boss! Also a bit of cleanup