jh - cleanup