still more clean up