Cleanups per review.