Clean some unused things...