Cleanup prior to master merge