* major cleanup