OZP-692: clean up on remove and IE7 test fix