code cleanup - removed unused code