WIP: code cleanup.
WIP: code cleaup.