code cleanup - still defunc