some code cleanup ahead of 2.2.2 release