Start of code cleanup.