THIS is the major cleanup