Clean some bits of code.