Record 1st round cleanup.

Removed some highly redundant code.