Continued updates cleanup.
Continued updates and cleanup.