more clean up again