#noissue Code Cleanup.

Getting ready to merge into master.