OZP-692: clean up on remove