Some cleaning in sofdemo