Code cleanup - 2