cleanup and idempotent liking