remove comment out old code