first of many clean ups