cleanup commented out old code