lots more clean up