even more clean up