code cleanup - remove some unused functions