Clean some crud