code cleanup

remove some old commented code