Some cleaning work.