Code cleanup only in preparation for updates.