Clean some unused code