Got rid of commented out old code