code cleanup before further updates.