Revert "Code cleanup additions"

This reverts commit dc82006a607e22d7383ec7e21aa433340a822840.