Remove unused upstream modules