Remove old comm function