Cleaning up some work that was accidentally committed. (+2 squashed commits)
Squashed commits:
[3891d19] More cleanup
[219c443] Change log update