Craig - clean up