Opps wrong revert - Revert "Revert "cleanup from merge""

This reverts commit 55616049de12f30d5e761ff0ffb1bc330b8b63d0.