code cleanup - commented code deleted