Clean some unused things

Clean some unused things