Remove JeremyOT clean up