Begin code cleanup.