final cleanup prior to merge to master