major cleanup done