Code cleanup - general.