cleaned up some old commented code