cleanup unnecessary commented out code