(#1132) - ensure it cleans up after itself