Some code cleanup is done.