clean up most of that mess