jh - clean up