JH - more clean up