Cleanup of impersonator primitives