JH - clean up